Conversation
* Update API and import envoyproxy/envoy#6263 * Update istio/api
* update envoy to latest Signed-off-by: Lizan Zhou <lizan@tetrate.io> * update envoy with latest build fixes (istio#2147) * fix build Signed-off-by: Lizan Zhou <lizan@tetrate.io> * fix build Signed-off-by: Lizan Zhou <lizan@tetrate.io> * fix formatting * fix status match Signed-off-by: Lizan Zhou <lizan@tetrate.io>
* Update envoy and build opt envoy commit date: 04/10/2019 bazel version: 0.22.0 Signed-off-by: Yuchen Dai <silentdai@gmail.com> * align envoy SHA in istio.deps with WORKSPACE Signed-off-by: Yuchen Dai <silentdai@gmail.com> * add comment above the uncomment local_repository Signed-off-by: Yuchen Dai <silentdai@gmail.com>
* API sha for proxy * Updating sha for API in Proxy
* Retrieve tracing header at report time * add license header * format * add an integration test * format * clean comment
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: crazyxy If they are not already assigned, you can assign the PR to them by writing The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google. ℹ️ Googlers: Go here for more info. |
googlebot
added
the
cla: no
yxue
force-pushed
the
master
branch
2 times, most recently
from
320cdfe to
62e2225
Compare
|
@duderino need your help to merge the pr |
|
I will work with @crazyxy on Monday to do the merge on the command line. If I merge it via the github UI I will squash all the commits and lose the git history. |
| void ExtractHeaders(const Http::HeaderMap& header_map, | ||
| const std::set<std::string>& exclusives, | ||
| std::map<std::string, std::string>& headers) { | ||
| void ExtractHeaders(const Http::HeaderMap &header_map, |
There was a problem hiding this comment.
Could you check when the "&" "*" format is introduced? I don't see this pattern else where
There was a problem hiding this comment.
I doubt this is caused by the different version of clang-format I used.
There was a problem hiding this comment.
If it is introduced at your merge, you'd better fixed with this PR.
If it is introduced by existing PR, we could fix it first and merge to master
| actual = "//external:ssl", | ||
| ) | ||
|
|
||
| # envoy commit date 04/10/2019 |
There was a problem hiding this comment.
I doubt some of the conflicts are not resolved correctly. John's PR shoudl beat this one: 0b76a30
There was a problem hiding this comment.
This is the redundant message. John's PR is down. If you check line 41, you will find John's PR. But I don't know why I didn't find this line when I resolving conflicts.
There was a problem hiding this comment.
Sure. git is not that reliable :) That's why we have this review
Please fix it in the follow up
9 participants
What this PR does / why we need it: Merger release-1.1 to master
Which issue this PR fixes: fixes #2218